Merge pull request #59 from juljun14/master

Commit to latest master