initial commit from current dev code on Edam
Merge pull request #1 from kymkovan/master

initial commit from Edam