#36 , fixed documentation
#36 , fixed indentation
merged with master-preview