fixed #4. Added options
fixed #5. Yard documentation
Merge branch 'feature/4' into develop