Merge pull request #18 from soul2zimate/master

update to accord with last re-factoring.