20130920
Merge branch 'master' of https://github.com/alex-aprm/Sinister.git