Added Dennis` part and fixed some small issues.
issueID #11