Some basic kind abstratus storage
Merge remote-tracking branch 'upstream/master'
Possible solve to problem.
Merge pull request #43 from kirderf1/master

Bugfix