Pull to fix bug

Merge pull request #3 from brandonrninefive/master