committing for backup
fixed issue with retrieval
committing for backup

too lazy
Merge branch 'dev' into issue50
#50