Added functions that were removed for backward compatiblity
Removed newline
Merge branch 'issue179' into current