Merge pull request #11 from flashii/master

Merging stable