Added some changes as suggested by Alex #17. Not complete though. #15 still n...