closes #28. Resolved warnings