prop for more dev
quick fix... ops pasted wrong functions lol
Merge branch 'release/0.1.4'