Resolved issue #42 and #66
Resolved not being able to upgrade from stable