Merge pull request #11 from flashii/master

Merging stable
Merge pull request #12 from flashii/stable

Merge pull request #11 from flashii/master