Updated functionality and libraries

There is an issue with the console app on Mac OS X, due to new line
encoding. Need to investigate later.