Adding new keywords
Bumped version number
Merge branch 'release/v0.1.4' into dev