.
Merge remote-tracking branch 'upstream/master'
Merge pull request #57 from kiranhugo/master

Cleanup in configuration