Merge pull request #37 from swarage/master

Initial vision
what have I changed?