Merge pull request #18 from sabottenda/comment

Add comment functions not implemeneted yet and many tests
add Token class