some minor changes and updates
Merge pull request #11 from Miai/master

update