Merge pull request #1 from ledzeppelin/sharrukin

Sharrukin
more progress