Merge pull request #80 from MeikoDis/master