remove some of the old approach Fixed #76 again
Merge pull request #91 from fireweb/master

remove some of the old approach Fixed #76 again