Merge pull request #39 from uburuntu/master

Some small fixes: compilation, null ptr derefence and const qualifiers