Fix #5 - Migrate from dev branch