past changes
Merge pull request #54 from gafrong/master

past changes