macrology 201
Merge pull request #4 from xeno-by/master

macrology 201