merge from denzil
new stuff work in progress
Merge pull request #2 from heppu/master

Merge changes.