final revert

will fix tomorrow
Merge pull request #18 from ManeBit/master

final revert - match branches