Merge pull request #6 from zjjott/master

Fast Forward to master