Merge pull request #206 from Juke34/master