#45 committing for backup
#45
#45
closes #45
closes #45