minor updates
Merge pull request #32 from nullet/everything_is_awesome

minor updates