Merge pull request #6 from LYK-Ruby-On-Rails/develop

Develop
Merge remote-tracking branch 'origin/develop'
Merge branch 'release/0.2.0'