Merge pull request #8 from PerfectMemory/master

Merge with PerfectMemory:master
Merge pull request #9 from PerfectMemory/master

Merge with PerfectMemory:master