Merge pull request #4 from wagnert/master

Optimizing code
Merge pull request #5 from wagnert/master

Remove unnecessary parameter from init() call, remove old @TODO annotati...
Add additional merge methods
Merge branch 'techdivision'