This is my 2nd to the last commit before I sleep
Merge branch 'master' of https://github.com/rbmrclo/amberlock