Merge pull request #1 from baseapp/master

updates
Merge pull request #8 from vikdatta/master

updates