New work done
Merge branch 'master' of https://github.com/tomasdeml/fuzzy-octo-nemesis.git