Constructor cleanup -- nonrecursive
Merge branch 'master' of https://github.com/smelendez/axion