Minor changes
Merge branch 'architecture'
Closing issue #25