Added some documentation
Added a more portable way of finding term size
Merge branch 'develop'