Update to 0.1.4-dev
Merge pull request #501 from ElBrogrammer/0.1.4-dev

Update to 0.1.4-dev