Housekeeping tasks
Merge pull request #1 from triplec1988/master

Housekeeping tasks