Merge pull request #63 from mhotan/master

Some added features