Merge pull request #1 from wisesmile/master

merge develop into master from github
initial commit
Merge branch 'develop' of github.com:wisesmile/2014-10-22 into develop
Merge branch 'develop'