Merge pull request #1 from littlesat/master

sync with master