Merge pull request #16 from Peardian/master

Master