Merge pull request #3 from raincole/raincole_working

Raincole working
Merge branch 'master' into raincole_working