- merged new pull request with version 0.7 release (changes were made from ver 0.6 codebase)