version 0.6 - updated comments + refactoring