Fixes #17
This fixes #17 and also resolves #17, closes user/repo#17
closes  OziBazaar/OziBazaar#17
Fixes #20
Merge branch 'v1_Spec'
close #19
Merge branch 'v1_Spec'
Merge branch 'master' into Sami_Ver1