Merge tag '0.5.1' into develop

Released 0.5.1 0.5.1
added properties for the number of entries
replaced tabs with spaces
bumped version
Merge branch 'release/0.5.2'