Closes #32 Fixed zkanda's pic