Merge pull request #67 from mentatzoe/master

Still alive