0.10.0
Merge branch 'master' into app_callback

Conflicts:
	README.md
fixed extra line
Merge pull request #5 from mlintern/app_callback

0.10.3