Added storage capabilities + various code improvements
Merge pull request #2 from mawrkus/various_improvements

Added storage capabilities + various code improvements