sync
Merge pull request #8 from trontrytel/master

sync