Initial Commit

Baseline 0.3-9
Merge pull request #1 from bauman/master

Approved