fixed bug
added new function
Merge branch 'topic' of github.com:pietervisser/temp into topic