Merge pull request #2 from christav/master

Tags & master update.