Commit 05/09/2014

Issue close #14, close #23, close #26