Merge pull request #10 from mchf/master

Removed functionality which was moved into first stage already.