version 0.0.6

Features:

Bugs:

Others:
add something for Heroku
Merge remote-tracking branch 'origin/master'