removing some of the advanced stuff - for now...
Merge pull request #2 from gusaus/master

removing some of the advanced stuff - for now...